From 7de752cfed949e64270979fd56d3753b62dba072 Mon Sep 17 00:00:00 2001 From: tsteven4 <13596209+tsteven4@users.noreply.github.com> Date: Sat, 22 Jan 2022 14:19:02 -0700 Subject: [PATCH] fix cmake status messages (#825) --- libusb.cmake | 8 ++++---- zlib.cmake | 6 +++--- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/libusb.cmake b/libusb.cmake index e186a6ba1..171193fe2 100644 --- a/libusb.cmake +++ b/libusb.cmake @@ -22,8 +22,8 @@ if(UNIX) list(APPEND LIBS usb-1.0) target_compile_definitions(gpsbabel PRIVATE LIBUSB_H_INCLUDE=) elseif(GPSBABEL_WITH_LIBUSB STREQUAL "custom") - message("libusb-1.0 is enabled but but must be manually configured.") - message(" e.g. GPSBABEL_WITH_LIBUSB=custom GPSBABEL_EXTRA_LINK_LIBRARIES:STRING==... GPSBABEL_EXTRA_INCLUDE_DIRECTORIES:STRING=...") + message(STATUS "libusb-1.0 is enabled but but must be manually configured.") + message(STATUS " e.g. GPSBABEL_WITH_LIBUSB=custom GPSBABEL_EXTRA_LINK_LIBRARIES:STRING==... GPSBABEL_EXTRA_INCLUDE_DIRECTORIES:STRING=...") target_compile_definitions(gpsbabel PRIVATE LIBUSB_H_INCLUDE=) else() message(FATAL_ERROR "GPSBABEL_WITH_LIBUSB=no|pkgconfig|system*|custom") @@ -55,8 +55,8 @@ if(UNIX) target_link_libraries(usb-1.0 INTERFACE objc "-framework IOKit" "-framework CoreFoundation") list(APPEND LIBS usb-1.0) elseif(GPSBABEL_WITH_LIBUSB STREQUAL "custom") - message("libusb-1.0 is enabled but but must be manually configured.") - message(" e.g. GPSBABEL_WITH_LIBUSB=custom GPSBABEL_EXTRA_LINK_LIBRARIES:STRING==... GPSBABEL_EXTRA_INCLUDE_DIRECTORIES:STRING=...") + message(STATUS "libusb-1.0 is enabled but but must be manually configured.") + message(STATUS " e.g. GPSBABEL_WITH_LIBUSB=custom GPSBABEL_EXTRA_LINK_LIBRARIES:STRING==... GPSBABEL_EXTRA_INCLUDE_DIRECTORIES:STRING=...") target_compile_definitions(gpsbabel PRIVATE LIBUSB_H_INCLUDE=) else() message(FATAL_ERROR "GPSBABEL_WITH_LIBUSB=no|pkgconfig|included*|custom") diff --git a/zlib.cmake b/zlib.cmake index c32100a53..950b57833 100644 --- a/zlib.cmake +++ b/zlib.cmake @@ -8,7 +8,7 @@ else() list(APPEND LIBS ZLIB::ZLIB) target_compile_definitions(gpsbabel PRIVATE HAVE_LIBZ) elseif(GPSBABEL_WITH_ZLIB STREQUAL "pkgconfig") - message("Using zlib found by pkg-config") + message(STATUS "Using zlib found by pkg-config") find_package(PkgConfig REQUIRED) pkg_search_module(ZLIB REQUIRED zlib>=1.2.9 IMPORTED_TARGET) list(APPEND LIBS PkgConfig::ZLIB) @@ -57,8 +57,8 @@ else() target_include_directories(z PUBLIC zlib) list(APPEND LIBS z) elseif(GPSBABEL_WITH_ZLIB STREQUAL "custom") - message("zlib is enabled but but must be manually configured.") - message(" e.g. GPSBABEL_WITH_ZLIB=custom GPSBABEL_EXTRA_LINK_LIBRARIES:STRING==... GPSBABEL_EXTRA_INCLUDE_DIRECTORIES:STRING=...") + message(STATUS "zlib is enabled but but must be manually configured.") + message(STATUS " e.g. GPSBABEL_WITH_ZLIB=custom GPSBABEL_EXTRA_LINK_LIBRARIES:STRING==... GPSBABEL_EXTRA_INCLUDE_DIRECTORIES:STRING=...") target_compile_definitions(gpsbabel PRIVATE HAVE_LIBZ) else() message(FATAL_ERROR "GPSBABEL_WITH_ZLIB=no|findpackage|pkgconfig|included*|custom") -- 2.30.2